From 04f5c2a1e772f3697ac4c4a0851006d4d18cb16d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 13 Sep 1999 22:06:11 +0000 Subject: [PATCH] gdk/gdkcolor.c (gdk_colormap_new) Fix memory leak: colormap->colors was 1999-09-14 Tor Lillqvist * gdk/gdkcolor.c (gdk_colormap_new) * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: colormap->colors was allocated twice. * gdk/win32/gdk.c: Remove some unused stuff. * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the colormap. * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) * gtk/gtklabel.h (gtk_label_get_type) * gtk/gtktipsquery.c (gtk_tips_query_get_type) * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType in a couple of places, not guint. --- ChangeLog | 17 +++++++++++++++++ ChangeLog.pre-2-0 | 17 +++++++++++++++++ ChangeLog.pre-2-10 | 17 +++++++++++++++++ ChangeLog.pre-2-2 | 17 +++++++++++++++++ ChangeLog.pre-2-4 | 17 +++++++++++++++++ ChangeLog.pre-2-6 | 17 +++++++++++++++++ ChangeLog.pre-2-8 | 17 +++++++++++++++++ gdk/gdkcolor.c | 1 - gdk/win32/gdk.c | 3 --- gdk/win32/gdkcolor-win32.c | 9 ++++++++- gdk/win32/gdkcolor.c | 9 ++++++++- gdk/win32/gdkmain-win32.c | 3 --- gdk/x11/gdkcolor-x11.c | 1 - gtk/gtkfontsel.c | 2 +- gtk/gtklabel.h | 2 +- gtk/gtktipsquery.c | 2 +- gtk/gtktypeutils.h | 2 +- 17 files changed, 139 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec1fc40aba..035debccd0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ec1fc40aba..035debccd0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,20 @@ +1999-09-14 Tor Lillqvist + + * gdk/gdkcolor.c (gdk_colormap_new) + * gdk/win32/gdkcolor.c (gdk_colormap_new): Fix memory leak: + colormap->colors was allocated twice. + + * gdk/win32/gdk.c: Remove some unused stuff. + + * gdk/win32/gdkcolor.c (gdk_colormap_sync): Initialize all of the + colormap. + + * gtk/gtkfontsel.c (gtk_font_selection_dialog_get_type) + * gtk/gtklabel.h (gtk_label_get_type) + * gtk/gtktipsquery.c (gtk_tips_query_get_type) + * gtk/gtktypeutils.h (gtk_type_name): : Use GtkType + in a couple of places, not guint. + Fri Sep 10 21:31:00 CEST 1999 Pablo Saratxaga * configure.in,po/et.po: added Estonian language file diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c index dd9f2b27b2..bd48087543 100644 --- a/gdk/gdkcolor.c +++ b/gdk/gdkcolor.c @@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual, case GDK_VISUAL_GRAYSCALE: case GDK_VISUAL_PSEUDO_COLOR: private->info = g_new0 (GdkColorInfo, colormap->size); - colormap->colors = g_new (GdkColor, colormap->size); private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, (GCompareFunc) gdk_color_equal); diff --git a/gdk/win32/gdk.c b/gdk/win32/gdk.c index d9d2dde820..96d6a1c125 100644 --- a/gdk/win32/gdk.c +++ b/gdk/win32/gdk.c @@ -46,8 +46,6 @@ static void gdkx_XConvertCase (KeySym symbol, static void gdk_exit_func (void); -static RETSIGTYPE gdk_signal (int signum); - /* Private variable declarations */ @@ -112,7 +110,6 @@ gboolean gdk_init_check (int *argc, char ***argv) { - HRESULT hres; gint i, j, k; if (gdk_initialized) diff --git a/gdk/win32/gdkcolor-win32.c b/gdk/win32/gdkcolor-win32.c index 2581e317f1..3712222eff 100644 --- a/gdk/win32/gdkcolor-win32.c +++ b/gdk/win32/gdkcolor-win32.c @@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual, case GDK_VISUAL_GRAYSCALE: case GDK_VISUAL_PSEUDO_COLOR: private->info = g_new0 (GdkColorInfo, colormap->size); - colormap->colors = g_new (GdkColor, colormap->size); private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, (GCompareFunc) gdk_color_equal); @@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap, colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255; } + for ( ; i < colormap->size; i++) + { + colormap->colors[i].pixel = i; + colormap->colors[i].red = 0; + colormap->colors[i].green = 0; + colormap->colors[i].blue = 0; + } + g_free (xpalette); } diff --git a/gdk/win32/gdkcolor.c b/gdk/win32/gdkcolor.c index 2581e317f1..3712222eff 100644 --- a/gdk/win32/gdkcolor.c +++ b/gdk/win32/gdkcolor.c @@ -1349,7 +1349,6 @@ gdk_colormap_new (GdkVisual *visual, case GDK_VISUAL_GRAYSCALE: case GDK_VISUAL_PSEUDO_COLOR: private->info = g_new0 (GdkColorInfo, colormap->size); - colormap->colors = g_new (GdkColor, colormap->size); private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, (GCompareFunc) gdk_color_equal); @@ -1487,6 +1486,14 @@ gdk_colormap_sync (GdkColormap *colormap, colormap->colors[i].blue = (xpalette[i].peBlue * 65535) / 255; } + for ( ; i < colormap->size; i++) + { + colormap->colors[i].pixel = i; + colormap->colors[i].red = 0; + colormap->colors[i].green = 0; + colormap->colors[i].blue = 0; + } + g_free (xpalette); } diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c index d9d2dde820..96d6a1c125 100644 --- a/gdk/win32/gdkmain-win32.c +++ b/gdk/win32/gdkmain-win32.c @@ -46,8 +46,6 @@ static void gdkx_XConvertCase (KeySym symbol, static void gdk_exit_func (void); -static RETSIGTYPE gdk_signal (int signum); - /* Private variable declarations */ @@ -112,7 +110,6 @@ gboolean gdk_init_check (int *argc, char ***argv) { - HRESULT hres; gint i, j, k; if (gdk_initialized) diff --git a/gdk/x11/gdkcolor-x11.c b/gdk/x11/gdkcolor-x11.c index dd9f2b27b2..bd48087543 100644 --- a/gdk/x11/gdkcolor-x11.c +++ b/gdk/x11/gdkcolor-x11.c @@ -77,7 +77,6 @@ gdk_colormap_new (GdkVisual *visual, case GDK_VISUAL_GRAYSCALE: case GDK_VISUAL_PSEUDO_COLOR: private->info = g_new0 (GdkColorInfo, colormap->size); - colormap->colors = g_new (GdkColor, colormap->size); private->hash = g_hash_table_new ((GHashFunc) gdk_color_hash, (GCompareFunc) gdk_color_equal); diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index 36eaf9b4d0..b9dc839698 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -3652,7 +3652,7 @@ gtk_font_selection_create_xlfd (gint size, * GtkFontSelectionDialog *****************************************************************************/ -guint +GtkType gtk_font_selection_dialog_get_type (void) { static guint font_selection_dialog_type = 0; diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 892f93d548..e9de3df32e 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -69,7 +69,7 @@ struct _GtkLabelClass }; -guint gtk_label_get_type (void); +GtkType gtk_label_get_type (void); GtkWidget* gtk_label_new (const char *str); void gtk_label_set_text (GtkLabel *label, const char *str); diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c index ccac79a18e..0d5530cbd3 100644 --- a/gtk/gtktipsquery.c +++ b/gtk/gtktipsquery.c @@ -81,7 +81,7 @@ static guint tips_query_signals[SIGNAL_LAST] = { 0 }; /* --- functions --- */ -guint +GtkType gtk_tips_query_get_type (void) { static guint tips_query_type = 0; diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h index 3e657b0cb6..190a36cbde 100644 --- a/gtk/gtktypeutils.h +++ b/gtk/gtktypeutils.h @@ -333,7 +333,7 @@ GtkType gtk_type_unique (GtkType parent_type, const GtkTypeInfo *type_info); void gtk_type_set_chunk_alloc (GtkType type, guint n_chunks); -gchar* gtk_type_name (guint type); +gchar* gtk_type_name (GtkType type); GtkType gtk_type_from_name (const gchar *name); GtkType gtk_type_parent (GtkType type); gpointer gtk_type_class (GtkType type); -- 2.30.2